Skip to content

Fix small xtrigger housekeeping bug. - #7026

Merged
wxtim merged 2 commits into
cylc:8.6.xfrom
hjoliver:xtrigger-housekeeping-fix
Nov 27, 2025
Merged

wxtim merged 2 commits into
cylc:8.6.xfrom
hjoliver:xtrigger-housekeeping-fix

Conversation

@hjoliver

@hjoliver hjoliver commented Oct 10, 2025 •

Copy link
Copy Markdown
Member

Found while investigating this forum post

The "next call" dict in xtrigger_mgr is not being housekept, so if the same xtrigger comes back into the pool later the "commencing xtrigger call" message will not be logged again when the calls do re-commence.

Check List

  • I have read CONTRIBUTING.md and added my name as a Code Contributor.
  • Contains logically grouped changes (else tidy your branch by rebase).
  • Does not contain off-topic changes (use other PRs for other changes).
  • Applied any dependency changes to both setup.cfg (and conda-environment.yml if present).
  • Tests are included (or explain why tests are not needed).
  • Changelog entry included if this is a change that can affect users
  • Cylc-Doc pull request opened if required at cylc/cylc-doc/pull/XXXX.
  • If this is a bug fix, PR should be raised against the relevant ?.?.x branch.

@hjoliver hjoliver added this to the 8.6.1 milestone Oct 10, 2025
@hjoliver hjoliver self-assigned this Oct 10, 2025
@hjoliver hjoliver added bug Something is wrong :( small labels Oct 10, 2025
@hjoliver
hjoliver force-pushed the xtrigger-housekeeping-fix branch from a1b45b6 to 3953fce Compare October 10, 2025 00:20
Comment thread cylc/flow/xtrigger_mgr.py
# General case: potentially slow asynchronous function call.
if sig in self.sat_xtrig:
# Already satisfied, just update the task
LOG.info(f"[{itask}] satisfying xtrigger prerequisite: {sig}")

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO we should log this as INFO, as confirmation that an xtrigger prerequisite is being satisfied by an existing xtrigger result.

@hjoliver
hjoliver force-pushed the xtrigger-housekeeping-fix branch from 3953fce to b8ba58a Compare October 10, 2025 00:30
Comment thread cylc/flow/xtrigger_mgr.py
LOG.debug(f"Housekeeping xtrigger result: {sig}")
del self.sat_xtrig[sig]
with suppress(KeyError):
del self.t_next_call[sig]

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the bug fix.

@oliver-sanders
oliver-sanders requested a review from wxtim November 5, 2025 11:55
@oliver-sanders oliver-sanders modified the milestones: 8.6.1, 8.6.2 Nov 25, 2025
@dwsutherland

Copy link
Copy Markdown
Member

Might need to be raised against 8.6.x

@oliver-sanders
oliver-sanders changed the base branch from master to 8.6.x November 27, 2025 09:50
@oliver-sanders
oliver-sanders force-pushed the xtrigger-housekeeping-fix branch from c57c166 to 7add1ad Compare November 27, 2025 09:53
@oliver-sanders oliver-sanders modified the milestones: 8.6.2, 8.6.1 Nov 27, 2025
@oliver-sanders

Copy link
Copy Markdown
Member

Changed base branch to 8.6.1 and rebased onto 8.6.x (was based on master).

@wxtim
wxtim merged commit 2d775c2 into cylc:8.6.x Nov 27, 2025
23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something is wrong :( small

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants